merge emacs-23
authorKenichi Handa <handa@m17n.org>
Fri, 27 May 2011 04:50:30 +0000 (13:50 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 27 May 2011 04:50:30 +0000 (13:50 +0900)

Trivial merge